Merge "Revert "Use new GX overlay for new AOD/lockscreen transitions."" into sc-dev