Merge "Fix issue with settings launch animation" into rvc-dev am: 36eb8c05 am: ae52ccc4 am: 1e00b8ce am: 15080db9 Change-Id: I4f123b5442161ed725ccbeb10282788b4872eb69