Merge "DO NOT MERGE Remove drawer jank and load less aggressively" into jb-mr2-dev