Merge "Restore app expectations around drawable visibility change timing" into mnc-dev