Merge "Do not wake AOD for hidden notifications" into udc-dev