Merge "Fix NPE in onCreate" into lmp-mr1-dev