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