Merge "Fix null pointer exception during device entry" into main