Merge "Add a null home activity to Shell.apk" am: fd2ba540df

Change-Id: I6f789c032dfd105ff81944ff3d6965673485fcac