Merge "Fix random systemui crashes during boot" am: 8078996f4a  -s ours
am: 7b4087acdb

Change-Id: Ib5f08316a5ae559fe8fab09601607e523bd32793