Merge "Add helper functions to WindowFrameTests to avoid using assertRect()"