am 04cb48f4: Merge "Adding workaround to allow shortcuts to skip the launch animation. (Bug 6447372)" into jb-dev

* commit '04cb48f465e7a9382efa9438ef9826ba5bcb416d':
  Adding workaround to allow shortcuts to skip the launch animation. (Bug 6447372)