Merge "Fix settings crash after androidx refactoring"