Merge "Fix Power Menu vanish when display size is Large" into pi-dev
am: 6b0b1dafbe

Change-Id: I1c803ca6628fd89ffaa04de3fbf2f8d71a46d037