Merge "Disable scrim focus on AOD" into pi-dev