Fix issue with screen pinning check not apply in 2 button am: 6e25a9d831
am: a1a171633f

Change-Id: Ia89fcb61ef8185bda6debc04b3e33e94120d60ae