Merge "Brings back "Control from locked device" setting." into tm-qpr-dev