Merge "API council recommended changes to bounds APIs in ActivityOptions"