Merge "Disable app chip menu height limit for bottom row" into main