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

Change-Id: I7393a9ad372f3e248193d282655f7f501ba2d488