Merge "Remove indicator theme for non-device entry activity" into tm-qpr-dev