Merge "Enable AOD image wallpaper and apply aod mask view."