Merge "Parameter to hide bottom affordances"