Merge "Expose public API to control mIsChildViewEnabled"