Merge "Do not collapse shade auto when SysUI start activities" into sc-dev