Merge "FP2-1061:"Unfortuately,Settings has stopped" pops up after change to Owner" into fp2-dev-v2