Merge "Enable shortcut view only if it's launched from power menu."
am: 044bfd7c99

Change-Id: I0933b392cdc32ae9fff1420b8e5544ef4150f472