Merge "Fix crash loop when activity controller was set" into nyc-dev
am: 099347936b

* commit '099347936b81ac553691a6e29e3a1d1dab903297':
  Fix crash loop when activity controller was set

Change-Id: I11ef71573b99e0eb80801382c465043b876a1974