Merge "Start AOD transition a frame earlier" into tm-dev