Merge "Add ScreenResolutionController to Settings app" into tm-dev