Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev