Merge "Differentiate Sim App Dialog layout for AOSP" into pi-dev