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