Merge "Refactoring: create method for marking display as needing layout."