Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev