Merge "Shell can now fake battery presence"