Merge "Fix avatar picker issues relating to screen rotation." into tm-dev