am 5805765d: am f8d25ea8: Merge "Don\'t promote functors onto layers due to...
am 5805765d: am f8d25ea8: Merge "Don\'t promote functors onto layers due to outline rect clipping" into mnc-dev
* commit '5805765d':
Don't promote functors onto layers due to outline rect clipping