Merge "Change show PlatformButtons apply height restrictions" into main