Match Main section to Cm as this will allow easier cherry-pick for future.

Change-Id: I889e76b7abeb98d7521b236a1f85a387546d1485
Merge github.com:TeamBliss-LP/android into lp5.0

Conflicts:
	default.xml

Change-Id: I2cb7beb1318ed384911d77a6e7842ceb0677741a