Merge "Merge "Fix advanced icon will incorrect on some device" into rvc-dev am: 40bdc176 am: 8494fdb1 am: 1526bd29" into rvc-qpr-dev-plus-aosp