Merge "Skip button layout spacing call when kids nav bar is active." into tm-qpr-dev