Merge "Resolve hidden API usage of Handler constructor"