Merge "Fix a NPE with Fragment#setUserVisibleHint" into nyc-dev