Merge "Separate AOD shelf from status view" into main