Merge "Increased side margin for showing docked stack dim layer."