Merge "Show unlock icon on AOD" into sc-v2-dev