Merge "Fix flicker of AppButtons"