am: 8b88a85 * commit '8b88a85032550dfd344e59dc419b0d9bb02c84b6': Fix generate layout params to preserve margins
8b88a85