Merge "Add dimens for waterfall display edges"