AppSidebar (1/2)

Change-Id: I3ecf4d4c2577181613ae9a1bcd53f930c02482c4

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Merge branch 'temp' into jb43
Revert "Update strings.xml"

This reverts commit fab54563a704f5848e4fa3b2cc7cc5b6aa0fcb12.