Merge "Fix CTS failed tests due to display area state"