Merge "Enable changing display configuration"