Merge "Add assumption that initial displaySize has changed" into android12L-tests-dev