Merge "Correctly update sensor status in restricted mode" into qt-dev am: e84ab77823
am: b64681a6f8

Change-Id: I85ff3bb0f3a07208a5bcd135310dbdf075903fcb