Merge "Revert "Add a null home activity to Shell.apk"" into rvc-dev