Merge "Set up none transition for relaunching apps during screen freeze" into nyc-dev am: 52c30b0c
am: 52eddf83
* commit '52eddf83':
Set up none transition for relaunching apps during screen freeze
Change-Id: If9037babcc74d625d49f4c4a404aeb153131b4d1