Merge "Set up none transition for relaunching apps during screen freeze" into nyc-dev