Merge "Fixes NPE on system app update"