Merge "Fix system UI break in some devices" am: 19788abedd
am: 6add1afd83

Change-Id: I2a59e3c5f83e841b797cfd72d7e76b694d7d788e