Merge "Change window header height to 40dp" into main