* commit '1e6048e0158310ee31e0310661bed06a41ac7dd7': DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows