Merge "Fix issue with settings launch animation" into rvc-dev am: 36eb8c05 am: ae52ccc4 am: 24b5d607 Change-Id: I6a2eef3ff1597b36519b27e1379611f99ddd5dce