Merge "Fix NPE when clicking "back" quickly." into lmp-dev