Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f am: eafda3c724

Change-Id: I3e92055ad03cfa4f0bbe80185840f5783559c96f