Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev