Merge "Added SIM Card Activity to Settings" into lmp-dev