Merge "Fix issue with settings launch animation" into rvc-dev am: 36eb8c05 am: 82e586c1 am: eda1d2ee Change-Id: Ia08f07fc1481bf750ef2c35acbbb4411b58a1285