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

Change-Id: Ic12e31ded9846e930acbb01e81583fd733669f54