Merge "Avoid animation flashing and fix padding." into jb-dev