Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev