Change default screen timeout to 1 min vice 6

Change-Id: Ia7592e41ee7945a80069b9acc0e173c8692b2415
Allow overwriting of default columns in QuickSettings

Change-Id: I6688824c74147a2cd25ea118912d8e0d814be70f