Merge "Add BROWSABLE for most Settings Activities" into tm-qpr-dev