Merge "Fix occasional phone app crash" into honeycomb-LTE