[DO NOT MERGE] Fix some visual jumps when swiping home am: 96c2220f7f

Change-Id: Iedb6f00c159551c97dbba33db78630977f333b91