Merge "Fix modeOnCanceled for LOCKSCREEN <=> AOD transitions" into main