Merge "Active display ~> display settings" into jb43