Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/bs_strings.xml