Merge "Disable activities in a way allowed on a user build" into lmp-dev