Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev