Merge "Fix NPE in RootActivityContainer"