Merge back parent release#3640

tamaskozmer merged 3 commits into

masterinstructure/canvas-android:masterfrom

release/parentinstructure/canvas-android:release/parentCopy head branch name to clipboard