Merge "Fix drawer layout sample app layout issue." into mnc-ub-dev